bitkeeper revision 1.636.1.1 (3fcb7b62Mifz8pPYuvEwJUTNwxzVmg)

Propagate return values as far as possible.

diff --git a/tools/xc/lib/xc_private.h b/tools/xc/lib/xc_private.h
index cdf99260dec1e30322753bfa7c427ad6d0a44261..26b2d95595c24858caa9166ee7b2c0137684b934 100644 (file)
--- a/tools/xc/lib/xc_private.h
+++ b/tools/xc/lib/xc_private.h
@@ -149,11 +149,9 @@ static inline int do_block_io_op(int xc_handle, block_io_op_t *op)
         goto out1;
     }
 
-    if ( do_xen_hypercall(xc_handle, &hypercall) < 0 )
+    if ( (ret = do_xen_hypercall(xc_handle, &hypercall)) < 0 )
         goto out2;
 
-    ret = 0;
-
  out2: (void)munlock(op, sizeof(*op));
  out1: return ret;
 }